From 1a0b6568fa9536682ab2929041e6b7296484d219 Mon Sep 17 00:00:00 2001
From: Lapo Calamandrei <calamandrei@gmail.com>
Date: Fri, 26 Feb 2016 12:53:02 +0100
Subject: [PATCH] Adwaita: fix separator in non paned using split headerbar

Fixes https://bugzilla.gnome.org/show_bug.cgi?id=762593
---
 gtk/theme/Adwaita/_common.scss           |  4 ++++
 gtk/theme/Adwaita/gtk-contained-dark.css | 20 +++++++++-----------
 gtk/theme/Adwaita/gtk-contained.css      | 20 +++++++++-----------
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index fe503d4333..56877445ad 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -1341,7 +1341,9 @@ headerbar {
       padding: 0;
     }
   }
+}
 
+headerbar {
   // add vertical margins to headerbar entries, buttons and separators to avoid them spanning the whole height
   entry,
   spinbutton,
@@ -1377,6 +1379,8 @@ headerbar {
     box-shadow: none;
   }
 
+  separator { background-color: $borders_color; }
+
   @extend %titlebar;
 }
 
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 9849a97f8c..3b13a93ff9 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -1750,17 +1750,13 @@ headerbar {
       min-width: 26px;
       margin: 0;
       padding: 0; }
-  .titlebar:not(headerbar) entry, .titlebar:not(headerbar) spinbutton:not(.vertical),
-  .titlebar:not(headerbar) spinbutton,
-  .titlebar:not(headerbar) separator,
-  .titlebar:not(headerbar) button,
-  headerbar entry,
-  headerbar spinbutton:not(.vertical),
-  headerbar spinbutton,
-  headerbar separator,
-  headerbar button {
-    margin-top: 6px;
-    margin-bottom: 6px; }
+
+headerbar entry, headerbar spinbutton:not(.vertical),
+headerbar spinbutton,
+headerbar separator,
+headerbar button {
+  margin-top: 6px;
+  margin-bottom: 6px; }
 
 .titlebar, .titlebar:backdrop {
   border-top-left-radius: 7px;
@@ -1778,6 +1774,8 @@ window.csd > .titlebar:not(headerbar) {
   border-style: none;
   border-color: transparent;
   box-shadow: none; }
+.titlebar:not(headerbar) separator {
+  background-color: #1c1f1f; }
 
 /************
  * Pathbars *
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 1c36c13974..e8e2ee638e 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -1754,17 +1754,13 @@ headerbar {
       min-width: 26px;
       margin: 0;
       padding: 0; }
-  .titlebar:not(headerbar) entry, .titlebar:not(headerbar) spinbutton:not(.vertical),
-  .titlebar:not(headerbar) spinbutton,
-  .titlebar:not(headerbar) separator,
-  .titlebar:not(headerbar) button,
-  headerbar entry,
-  headerbar spinbutton:not(.vertical),
-  headerbar spinbutton,
-  headerbar separator,
-  headerbar button {
-    margin-top: 6px;
-    margin-bottom: 6px; }
+
+headerbar entry, headerbar spinbutton:not(.vertical),
+headerbar spinbutton,
+headerbar separator,
+headerbar button {
+  margin-top: 6px;
+  margin-bottom: 6px; }
 
 .titlebar, .titlebar:backdrop {
   border-top-left-radius: 7px;
@@ -1782,6 +1778,8 @@ window.csd > .titlebar:not(headerbar) {
   border-style: none;
   border-color: transparent;
   box-shadow: none; }
+.titlebar:not(headerbar) separator {
+  background-color: #9d9d99; }
 
 /************
  * Pathbars *
-- 
2.30.2